Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 10 Feb 2011 18:37:27 +0000 (10:37 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 10 Feb 2011 18:37:27 +0000 (10:37 -0800)
commitbc8a68d3ce4d7b06931d63f5f64c75420d3f8cab
tree0631f5e945dc07aa44a87036f3f49ab6e0ce6c2a
parenta81ebc8311091e6a7a9e767b7382c4a0c167dac3
parent459fdbb15c53e0f4f30aa1a3500e0a6a56907110
Merge from mainline.